flowbox: Derive from GtkWidget

diff --git a/gtk/a11y/gtkflowboxaccessible.c b/gtk/a11y/gtkflowboxaccessible.c
index 5f03bf50876eaebb52ba5e11dadf88bb17112bac..40b65857fc2e313edb8cdcb34d7195d2f2e1b866 100644 (file)
--- a/gtk/a11y/gtkflowboxaccessible.c
+++ b/gtk/a11y/gtkflowboxaccessible.c
@@ -23,7 +23,7 @@
 
 static void atk_selection_interface_init (AtkSelectionIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (GtkFlowBoxAccessible, gtk_flow_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
+G_DEFINE_TYPE_WITH_CODE (GtkFlowBoxAccessible, gtk_flow_box_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
 
 static void

diff --git a/gtk/a11y/gtkflowboxaccessible.h b/gtk/a11y/gtkflowboxaccessible.h
index 3447315f50ef8d2f0ea2902aa7e08e6c086c25fa..8a5f8376c17f74d98381fe30b996a995ac9dcbdc 100644 (file)
--- a/gtk/a11y/gtkflowboxaccessible.h
+++ b/gtk/a11y/gtkflowboxaccessible.h
@@ -22,7 +22,7 @@
 #error "Only <gtk/gtk-a11y.h> can be included directly."
 #endif
 
-#include <gtk/a11y/gtkcontaineraccessible.h>
+#include <gtk/a11y/gtkwidgetaccessible.h>
 
 G_BEGIN_DECLS
 
@@ -39,14 +39,14 @@ typedef struct _GtkFlowBoxAccessiblePrivate GtkFlowBoxAccessiblePrivate;
 
 struct _GtkFlowBoxAccessible
 {
-  GtkContainerAccessible parent;
+  GtkWidgetAccessible parent;
 
   GtkFlowBoxAccessiblePrivate *priv;
 };
 
 struct _GtkFlowBoxAccessibleClass
 {
-  GtkContainerAccessibleClass parent_class;
+  GtkWidgetAccessibleClass parent_class;
 };
 
 GDK_AVAILABLE_IN_ALL

diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c
index b8ff3dd63717db6829f936baca27f3301a190c93..f5afde78fb33ae2fcb0abfae604cb29dda152989 100644 (file)
--- a/gtk/gtkflowbox.c
+++ b/gtk/gtkflowbox.c
@@ -725,12 +725,12 @@ typedef struct _GtkFlowBoxClass       GtkFlowBoxClass;
 
 struct _GtkFlowBox
 {
-  GtkContainer container;
+  GtkWidget container;
 };
 
 struct _GtkFlowBoxClass
 {
-  GtkContainerClass parent_class;
+  GtkWidgetClass parent_class;
 
   void (*child_activated)            (GtkFlowBox        *box,
                                       GtkFlowBoxChild   *child);
@@ -802,11 +802,15 @@ struct _GtkFlowBoxPrivate {
 
 #define BOX_PRIV(box) ((GtkFlowBoxPrivate*)gtk_flow_box_get_instance_private ((GtkFlowBox*)(box)))
 
-G_DEFINE_TYPE_WITH_CODE (GtkFlowBox, gtk_flow_box, GTK_TYPE_CONTAINER,
+static void gtk_flow_box_buildable_iface_init (GtkBuildableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GtkFlowBox, gtk_flow_box, GTK_TYPE_WIDGET,
                          G_ADD_PRIVATE (GtkFlowBox)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL))
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL)
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+                                                gtk_flow_box_buildable_iface_init))
 
-/*  Internal API, utilities {{{2 */
+/*  Internal API, utilities {{{2 */ 
 
 #define ORIENTATION_ALIGN(box)                              \
   (BOX_PRIV(box)->orientation == GTK_ORIENTATION_HORIZONTAL \
@@ -891,7 +895,7 @@ gtk_flow_box_apply_sort (GtkFlowBox      *box,
     }
 }
 
-/* Selection utilities {{{3 */
+/* Sel ection utilities {{{3 */
 
 static gboolean
 gtk_flow_box_child_set_selected (GtkFlowBoxChild *child,
@@ -2977,15 +2981,6 @@ gtk_flow_box_unmap (GtkWidget *widget)
   GTK_WIDGET_CLASS (gtk_flow_box_parent_class)->unmap (widget);
 }
 
-/* GtkContainer implementation {{{2 */
-
-static void
-gtk_flow_box_add (GtkContainer *container,
-                  GtkWidget    *child)
-{
-  gtk_flow_box_insert (GTK_FLOW_BOX (container), child, -1);
-}
-
 /**
  * gtk_flow_box_remove:
  * @box: a #GtkFlowBox
@@ -3037,29 +3032,6 @@ gtk_flow_box_remove (GtkFlowBox *box,
     g_signal_emit (box, signals[SELECTED_CHILDREN_CHANGED], 0);
 }
 
-static void
-gtk_flow_box_forall (GtkContainer *container,
-                     GtkCallback   callback,
-                     gpointer      callback_target)
-{
-  GSequenceIter *iter;
-  GtkWidget *child;
-
-  iter = g_sequence_get_begin_iter (BOX_PRIV (container)->children);
-  while (!g_sequence_iter_is_end (iter))
-    {
-      child = g_sequence_get (iter);
-      iter = g_sequence_iter_next (iter);
-      callback (child, callback_target);
-    }
-}
-
-static GType
-gtk_flow_box_child_type (GtkContainer *container)
-{
-  return GTK_TYPE_FLOW_BOX_CHILD;
-}
-
 /* Keynav {{{2 */
 
 static gboolean
@@ -3485,7 +3457,7 @@ gtk_flow_box_set_property (GObject      *object,
 }
 
 static void
-gtk_flow_box_finalize (GObject *obj)
+gtk_flow_box_dispose (GObject *obj)
 {
   GtkFlowBoxPrivate *priv = BOX_PRIV (obj);
 
@@ -3494,7 +3466,21 @@ gtk_flow_box_finalize (GObject *obj)
   if (priv->sort_destroy != NULL)
     priv->sort_destroy (priv->sort_data);
 
-  g_sequence_free (priv->children);
+  if (priv->children)
+    {
+      GSequenceIter *iter;
+      GtkWidget *child;
+
+      for (iter = g_sequence_get_begin_iter (priv->children);
+           !g_sequence_iter_is_end (iter);
+           iter = g_sequence_iter_next (iter))
+        {
+          child = g_sequence_get (iter);
+          gtk_widget_unparent (child);
+        }
+      g_clear_pointer (&priv->children, g_sequence_free);
+    }
+
   g_clear_object (&priv->hadjustment);
   g_clear_object (&priv->vadjustment);
 
@@ -3507,7 +3493,28 @@ gtk_flow_box_finalize (GObject *obj)
       g_clear_object (&priv->bound_model);
     }
 
-  G_OBJECT_CLASS (gtk_flow_box_parent_class)->finalize (obj);
+  G_OBJECT_CLASS (gtk_flow_box_parent_class)->dispose (obj);
+}
+
+static void
+gtk_flow_box_compute_expand (GtkWidget *widget,
+                             gboolean  *hexpand_p,
+                             gboolean  *vexpand_p)
+{
+  GtkWidget *w;
+  gboolean hexpand = FALSE;
+  gboolean vexpand = FALSE;
+
+  for (w = gtk_widget_get_first_child (widget);
+       w != NULL;
+       w = gtk_widget_get_next_sibling (w))
+    {
+      hexpand = hexpand || gtk_widget_compute_expand (w, GTK_ORIENTATION_HORIZONTAL);
+      vexpand = vexpand || gtk_widget_compute_expand (w, GTK_ORIENTATION_VERTICAL);
+    }
+
+  *hexpand_p = hexpand;
+  *vexpand_p = vexpand;
 }
 
 static void
@@ -3515,9 +3522,8 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
 {
   GObjectClass      *object_class = G_OBJECT_CLASS (class);
   GtkWidgetClass    *widget_class = GTK_WIDGET_CLASS (class);
-  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
 
-  object_class->finalize = gtk_flow_box_finalize;
+  object_class->dispose = gtk_flow_box_dispose;
   object_class->get_property = gtk_flow_box_get_property;
   object_class->set_property = gtk_flow_box_set_property;
 
@@ -3526,13 +3532,9 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
   widget_class->focus = gtk_flow_box_focus;
   widget_class->snapshot = gtk_flow_box_snapshot;
   widget_class->get_request_mode = gtk_flow_box_get_request_mode;
+  widget_class->compute_expand = gtk_flow_box_compute_expand;
   widget_class->measure = gtk_flow_box_measure;
 
-  container_class->add = gtk_flow_box_add;
-  container_class->remove = gtk_flow_box_remove;
-  container_class->forall = gtk_flow_box_forall;
-  container_class->child_type = gtk_flow_box_child_type;
-
   class->activate_cursor_child = gtk_flow_box_activate_cursor_child;
   class->toggle_cursor_child = gtk_flow_box_toggle_cursor_child;
   class->move_cursor = gtk_flow_box_move_cursor;
@@ -3922,7 +3924,7 @@ gtk_flow_box_bound_model_changed (GListModel *list,
       GtkFlowBoxChild *child;
 
       child = gtk_flow_box_get_child_at_index (box, position);
-      gtk_container_remove (GTK_CONTAINER (box), GTK_WIDGET (child));
+      gtk_flow_box_remove (box, GTK_WIDGET (child));
     }
 
   for (i = 0; i < added; i++)
@@ -3952,7 +3954,30 @@ gtk_flow_box_bound_model_changed (GListModel *list,
     }
 }
 
- /* Public API {{{2 */
+/* Buildable implemenation {{{3 */
+
+static GtkBuildableIface *parent_buildable_iface;
+
+static void
+gtk_flow_box_buildable_add_child (GtkBuildable *buildable,
+                                  GtkBuilder   *builder,
+                                  GObject      *child,
+                                  const gchar  *type)
+{
+  if (GTK_IS_WIDGET (child))
+    gtk_flow_box_insert (GTK_FLOW_BOX (buildable), GTK_WIDGET (child), -1);
+  else
+    parent_buildable_iface->add_child (buildable, builder, child, type);
+}
+
+static void
+gtk_flow_box_buildable_iface_init (GtkBuildableIface *iface)
+{
+  parent_buildable_iface = g_type_interface_peek_parent (iface);
+
+  iface->add_child = gtk_flow_box_buildable_add_child;
+}
+  /* Public API {{{2 */
 
 /**
  * gtk_flow_box_new:
@@ -4223,7 +4248,7 @@ gtk_flow_box_bind_model (GtkFlowBox                 *box,
     }
 
   while ((child = gtk_widget_get_first_child (GTK_WIDGET (box))))
-    gtk_container_remove (GTK_CONTAINER (box), child);
+    gtk_flow_box_remove (box, child);
 
   if (model == NULL)
     return;

diff --git a/gtk/gtkflowbox.h b/gtk/gtkflowbox.h
index 75d9498955cc92ea688846970308e36b42e2c2df..da8b1ceb3ed59a272c719b5bae3b81e843717604 100644 (file)
--- a/gtk/gtkflowbox.h
+++ b/gtk/gtkflowbox.h
@@ -29,7 +29,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS